bitkeeper revision 1.1159.47.1 (41261688nlAL_qxZPnYEzHLXT049dg)

Initialise xen block-front device before ide and scsi so we get a change of grabing their majors of we've been asked.

diff --git a/.rootkeys b/.rootkeys
index 6089d9aa831187d96daf291507ef009579a65ad0..8914576fd36128f1c66154639fde4119e555217b 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -172,6 +172,7 @@
 40f56239sFcjHiIRmnObRIDF-zaeKQ linux-2.6.7-xen-sparse/arch/xen/kernel/process.c
 40f562392LBhwmOxVPsYdkYXMxI_ZQ linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c
 3f68905c5eiA-lBMQSvXLMWS1ikDEA linux-2.6.7-xen-sparse/arch/xen/kernel/xen_proc.c
+41261688yS8eAyy-7kzG4KBs0xbYCA linux-2.6.7-xen-sparse/drivers/Makefile
 4108f5c1WfTIrs0HZFeV39sttekCTw linux-2.6.7-xen-sparse/drivers/char/mem.c
 4111308bZAIzwf_Kzu6x1TZYZ3E0_Q linux-2.6.7-xen-sparse/drivers/char/tty_io.c
 40f56239Dp_vMTgz8TEbvo1hjHGc3w linux-2.6.7-xen-sparse/drivers/xen/Makefile

diff --git a/linux-2.6.7-xen-sparse/arch/xen/Makefile b/linux-2.6.7-xen-sparse/arch/xen/Makefile
index 227bea12445afc7c0f419c56899159aa276be253..e3772803d3a042abd800f87e650f68190de36758 100644 (file)
--- a/linux-2.6.7-xen-sparse/arch/xen/Makefile
+++ b/linux-2.6.7-xen-sparse/arch/xen/Makefile
@@ -24,8 +24,6 @@ UTS_MACHINE := $(XENARCH)
 
 core-y += arch/xen/kernel/
 
-drivers-y      += drivers/xen/
-
 include/.asm-ignore:
        @rm -f include/.asm-ignore
        @mv include/asm include/.asm-ignore

diff --git a/linux-2.6.7-xen-sparse/drivers/Makefile b/linux-2.6.7-xen-sparse/drivers/Makefile
new file mode 100644 (file)
index 0000000..1e2b996
--- /dev/null
+++ b/linux-2.6.7-xen-sparse/drivers/Makefile
@@ -0,0 +1,54 @@
+#
+# Makefile for the Linux kernel device drivers.
+#
+# 15 Sep 2000, Christoph Hellwig <hch@infradead.org>
+# Rewritten to use lists instead of if-statements.
+#
+
+obj-$(CONFIG_PCI)              += pci/
+obj-$(CONFIG_PARISC)           += parisc/
+obj-$(CONFIG_ACPI_BOOT)                += acpi/
+# PnP must come after ACPI since it will eventually need to check if acpi
+# was used and do nothing if so
+obj-$(CONFIG_PNP)              += pnp/
+
+# char/ comes before serial/ etc so that the VT console is the boot-time
+# default.
+
+obj-y                          += char/
+obj-y                          += serial/
+obj-$(CONFIG_PARPORT)          += parport/
+obj-y                          += base/ block/ misc/ net/ media/
+obj-$(CONFIG_NUBUS)            += nubus/
+obj-$(CONFIG_ATM)              += atm/
+obj-$(CONFIG_PPC_PMAC)         += macintosh/
+obj-$(CONFIG_ARCH_XEN)         += xen/
+obj-$(CONFIG_IDE)              += ide/
+obj-$(CONFIG_FC4)              += fc4/
+obj-$(CONFIG_SCSI)             += scsi/
+obj-$(CONFIG_FUSION)           += message/
+obj-$(CONFIG_IEEE1394)         += ieee1394/
+obj-y                          += cdrom/ video/
+obj-$(CONFIG_MTD)              += mtd/
+obj-$(CONFIG_PCMCIA)           += pcmcia/
+obj-$(CONFIG_DIO)              += dio/
+obj-$(CONFIG_SBUS)             += sbus/
+obj-$(CONFIG_ZORRO)            += zorro/
+obj-$(CONFIG_MAC)              += macintosh/
+obj-$(CONFIG_PARIDE)           += block/paride/
+obj-$(CONFIG_TC)               += tc/
+obj-$(CONFIG_USB)              += usb/
+obj-$(CONFIG_USB_GADGET)       += usb/gadget/
+obj-$(CONFIG_INPUT)            += input/
+obj-$(CONFIG_GAMEPORT)         += input/gameport/
+obj-$(CONFIG_SERIO)            += input/serio/
+obj-$(CONFIG_I2O)              += message/
+obj-$(CONFIG_I2C)              += i2c/
+obj-$(CONFIG_PHONE)            += telephony/
+obj-$(CONFIG_MD)               += md/
+obj-$(CONFIG_BT)               += bluetooth/
+obj-$(CONFIG_ISDN)             += isdn/
+obj-$(CONFIG_MCA)              += mca/
+obj-$(CONFIG_EISA)             += eisa/
+obj-$(CONFIG_CPU_FREQ)         += cpufreq/
+obj-y                          += firmware/